Merge pull request #3310 from igoropaniuk/boot_count

sysroot: Support boot counting for boot entries

diff --cc apidoc/ostree-sections.txt
Simple merge

diff --cc src/libostree/libostree-devel.sym
Simple merge

diff --cc src/libostree/ostree-repo.c
Simple merge

diff --cc src/libostree/ostree-sysroot-deploy.c
index f2edef8ec9ae41d56de481f81f35eb45b7e52424,740bc69f53a517530e90f57a9e8f5c0023ffdba8..18be562099cb0947d8e8f0c2c9e9b8aaed367137
--- 1/src/libostree/ostree-sysroot-deploy.c
--- 2/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@@ -37,9 -38,9 +38,10 @@@
  #endif
  
  #include "libglnx.h"
+ #include "ostree-bootconfig-parser-private.h"
  #include "ostree-core-private.h"
  #include "ostree-deployment-private.h"
 +#include "ostree-kernel-args-private.h"
  #include "ostree-linuxfsutil.h"
  #include "ostree-repo-private.h"
  #include "ostree-sepolicy-private.h"